From b2e30fb66e2fe85f94fe8a5a3a5a23bd9435253a Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Thu, 8 Dec 2016 19:56:56 +0100
Subject: [PATCH] vulkan: Don't wait until graphics are done computing

We can let the GPU do its stuff without waiting. The GPU knows what it's
doing.

Which means we now get a lot of time to spend on doing CPU things (read:
we're way better in benchmarks).

The old behavior is safer, so we want to keep it around for debugging.
It can be reenabled with GSK_RENDERING_MODE=sync.
---
 gsk/gskdebug.c        |  2 ++
 gsk/gskdebugprivate.h |  6 ++++--
 gsk/gskvulkanrender.c | 13 ++++++++-----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/gsk/gskdebug.c b/gsk/gskdebug.c
index bf82b892c8..02ed8b8de0 100644
--- a/gsk/gskdebug.c
+++ b/gsk/gskdebug.c
@@ -16,6 +16,8 @@ static const GDebugKey gsk_debug_keys[] = {
 static const GDebugKey gsk_rendering_keys[] = {
   { "geometry", GSK_RENDERING_MODE_GEOMETRY },
   { "shaders", GSK_RENDERING_MODE_SHADERS },
+  { "sync", GSK_RENDERING_MODE_SYNC },
+  { "staging-image", GSK_RENDERING_MODE_STAGING_IMAGE },
 };
 
 gboolean
diff --git a/gsk/gskdebugprivate.h b/gsk/gskdebugprivate.h
index 29e529beed..a5d4784fe9 100644
--- a/gsk/gskdebugprivate.h
+++ b/gsk/gskdebugprivate.h
@@ -17,8 +17,10 @@ typedef enum {
 } GskDebugFlags;
 
 typedef enum {
-  GSK_RENDERING_MODE_GEOMETRY = 1 << 0,
-  GSK_RENDERING_MODE_SHADERS  = 1 << 1
+  GSK_RENDERING_MODE_GEOMETRY      = 1 << 0,
+  GSK_RENDERING_MODE_SHADERS       = 1 << 1,
+  GSK_RENDERING_MODE_SYNC          = 1 << 2,
+  GSK_RENDERING_MODE_STAGING_IMAGE = 1 << 3
 } GskRenderingMode;
 
 gboolean gsk_check_debug_flags (GskDebugFlags flags);
diff --git a/gsk/gskvulkanrender.c b/gsk/gskvulkanrender.c
index b645dc3397..640c321db8 100644
--- a/gsk/gskvulkanrender.c
+++ b/gsk/gskvulkanrender.c
@@ -272,11 +272,14 @@ gsk_vulkan_render_submit (GskVulkanRender *self)
                                },
                                self->fence);
 
-  GSK_VK_CHECK (vkWaitForFences, gdk_vulkan_context_get_device (self->vulkan),
-                                 1,
-                                 &self->fence,
-                                 VK_TRUE,
-                                 INT64_MAX);
+  if (GSK_RENDER_MODE_CHECK (SYNC))
+    {
+      GSK_VK_CHECK (vkWaitForFences, gdk_vulkan_context_get_device (self->vulkan),
+                                     1,
+                                     &self->fence,
+                                     VK_TRUE,
+                                     INT64_MAX);
+    }
 }
 
 static void
-- 
2.30.2